pmcf 3.13.5 → 3.13.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.13.5",
+  "version": "3.13.7",
   "publishConfig": {
     "access": "public"
   },
@@ -53,16 +53,16 @@
   "dependencies": {
     "ip-utilties": "^1.4.9",
     "npm-pkgbuild": "^18.3.9",
-    "pacc": "^4.39.2",
+    "pacc": "^4.39.3",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {
-    "@types/node": "^24.6.0",
+    "@types/node": "^24.6.2",
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
     "semantic-release": "^24.2.9",
-    "typescript": "^5.9.2"
+    "typescript": "^5.9.3"
   },
   "engines": {
     "node": ">=22.20.0"

package/src/cluster.mjs

@@ -14,7 +14,6 @@ import { writeLines } from "./utils.mjs";
 const ClusterTypeDefinition = {
   name: "cluster",
   owners: [Owner.typeDefinition, "network", "location", "root"],
-  priority: 0.7,
   extends: Host.typeDefinition,
   key: "name",
   attributes: {

package/src/extra-source-service.mjs

@@ -5,9 +5,9 @@ import { networkAddressType } from "pmcf";
 
 export const ExtraSourceServiceTypeDefinition = {
   name: "extra-source-service",
-  owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
-  priority: 0.1,
+  specializationOf: ServiceTypeDefinition,
+  owners: ServiceTypeDefinition.owners,
   attributes: {
     source: {
       ...default_attribute_writable,

package/src/host.mjs

@@ -26,7 +26,6 @@ import { NetworkInterfaceTypeDefinition } from "./network-interfaces/network-int
 
 const HostTypeDefinition = {
   name: "host",
-  priority: 0.5,
   owners: ["owner", "network", "root"],
   extends: Base.typeDefinition,
   key: "name",

package/src/location.mjs

@@ -7,7 +7,6 @@ import { loadHooks } from "./hooks.mjs";
 const LocationTypeDefinition = {
   name: "location",
   owners: [Owner.typeDefinition, "location", "root"],
-  priority: 1.0,
   extends: Owner.typeDefinition,
   key: "name",
   attributes: {

package/src/module.mjs

@@ -26,6 +26,7 @@ export * from "./services/openldap.mjs";
 export * from "./services/influxdb.mjs";
 export * from "./services/mosquitto.mjs";
 export * from "./services/headscale.mjs";
+export * from "./services/tailscale.mjs";
 export * from "./services/systemd-journal.mjs";
 export * from "./services/systemd-journal-remote.mjs";
 export * from "./services/systemd-journal-upload.mjs";

package/src/network-interfaces/ethernet.mjs

@@ -7,10 +7,9 @@ import {
 
 export const EthernetNetworkInterfaceTypeDefinition = {
   name: "ethernet",
+  extends: NetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: NetworkInterfaceTypeDefinition.owners,
-  extends: NetworkInterfaceTypeDefinition,
-  priority: 0.1,
   key: "name",
   attributes: {
     arpbridge: {

package/src/network-interfaces/loopback.mjs

@@ -5,10 +5,9 @@ import { addType } from "../types.mjs";
 
 const LoopbackNetworkInterfaceTypeDefinition = {
   name: "loopback",
+  extends: NetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: NetworkInterfaceTypeDefinition.owners,
-  extends: NetworkInterfaceTypeDefinition,
-  priority: 0.1,
   key: "name"
 };
 

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

@@ -17,7 +17,6 @@ import { Network } from "../network.mjs";
 
 export const NetworkInterfaceTypeDefinition = {
   name: "network_interface",
-  priority: 0.4,
   owners: ["host"],
   extends: Base.typeDefinition,
   specializations: {},

package/src/network-interfaces/tun.mjs

@@ -4,10 +4,9 @@ import { addType } from "../types.mjs";
 
 const TUNdNetworkInterfaceTypeDefinition = {
   name: "tun",
+  extends: NetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: NetworkInterfaceTypeDefinition.owners,
-  extends: NetworkInterfaceTypeDefinition,
-  priority: 0.1,
   key: "name"
 };
 

package/src/network-interfaces/wireguard.mjs

@@ -4,10 +4,9 @@ import { addType } from "../types.mjs";
 
 const WireguardNetworkInterfaceTypeDefinition = {
   name: "wireguard",
+  extends: NetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: NetworkInterfaceTypeDefinition.owners,
-  extends: NetworkInterfaceTypeDefinition,
-  priority: 0.1,
   key: "name"
 };
 

package/src/network-interfaces/wlan.mjs

@@ -11,10 +11,9 @@ import {
 
 const WLANNetworkInterfaceTypeDefinition = {
   name: "wlan",
+  extends: EthernetNetworkInterfaceTypeDefinition,
   specializationOf: NetworkInterfaceTypeDefinition,
   owners: EthernetNetworkInterfaceTypeDefinition.owners,
-  extends: EthernetNetworkInterfaceTypeDefinition,
-  priority: 0.1,
   key: "name",
   attributes: {
     ssid: string_attribute_writable,

package/src/network.mjs

@@ -7,7 +7,6 @@ import { networkAttributes } from "./network-support.mjs";
 export const NetworkTypeDefinition = {
   name: "network",
   owners: ["location", "owner", "root"],
-  priority: 0.8,
   extends: Owner.typeDefinition,
   key: "name",
   attributes: {

package/src/owner.mjs

@@ -14,7 +14,6 @@ import { networks_attribute } from "./network-support.mjs";
 const OwnerTypeDefinition = {
   name: "owner",
   owners: ["location", "owner", "root"],
-  priority: 0.9,
   extends: Base.typeDefinition,
   key: "name",
   attributes: {

package/src/root.mjs

@@ -5,7 +5,6 @@ import { addType, types, resolveTypeLinks, typeFactory } from "./types.mjs";
 
 const RootTypeDefinition = {
   name: "root",
-  priority: 1000,
   extends: Location.typeDefinition
 };
 
@@ -76,7 +75,7 @@ export class Root extends Location {
 
   async loadAll() {
     for (const type of Object.values(types).sort(
-      (a, b) => b.priority - a.priority
+      (a, b) => (b.priority || 1.0) - (a.priority || 1.0)
     )) {
       if (type.clazz) {
         for await (const name of glob(type.clazz.fileNameGlob, {

package/src/service.mjs

@@ -43,7 +43,6 @@ export const endpointAttributes = {
 export const EndpointTypeDefinition = {
   name: "endpoint",
   owners: ["service", "network_interface"],
-  priority: 0.4,
   specializations: {},
   key: "type",
   attributes: endpointAttributes
@@ -52,7 +51,6 @@ export const EndpointTypeDefinition = {
 export const ServiceTypeDefinition = {
   name: "service",
   owners: [Host.typeDefinition, "cluster", "network_interface"],
-  priority: 0.4,
   extends: Base.typeDefinition,
   specializations: {},
   factoryFor(owner, value) {

package/src/services/bind.mjs

@@ -9,7 +9,8 @@ import {
   boolean_attribute_writable_true,
   boolean_attribute_writable_false,
   number_attribute_writable,
-  string_collection_attribute_writable
+  string_collection_attribute_writable,
+  name_attribute_writable
 } from "pacc";
 import { writeLines, asArray } from "../utils.mjs";
 import {
@@ -25,18 +26,35 @@ import {
   networkAddressType
 } from "pmcf";
 import { addType } from "../types.mjs";
-import { Service, ServiceTypeDefinition } from "../service.mjs";
+import { ServiceTypeDefinition } from "../service.mjs";
 import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
 import { addHook } from "../hooks.mjs";
 
+const BindServiceViewTypeDefinition = {
+  name: "bind-view",
+  key: "name",
+  attributes: {
+    name: { ...name_attribute_writable },
+    access: {
+      type: networkAddressType,
+      collection: true,
+      writable: true
+    }
+  }
+};
+
 const BindServiceTypeDefinition = {
   name: "bind",
+  extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ExtraSourceServiceTypeDefinition,
-  priority: 0.1,
   key: "name",
   attributes: {
+    /*views: {
+      type: "object", //BindServiceViewTypeDefinition,
+      collection: true,
+      writable: true
+    },*/
     zones: {
       type: oneOfType([networkAddressType, "location", "owner"]),
       collection: true,

package/src/services/chrony.mjs

@@ -2,11 +2,7 @@ import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal } from "ip-utilties";
 import { addType } from "../types.mjs";
-import {
-  Service,
-  ServiceTypeDefinition,
-  serviceEndpoints
-} from "../service.mjs";
+import { ServiceTypeDefinition, serviceEndpoints } from "../service.mjs";
 import {
   ExtraSourceService,
   ExtraSourceServiceTypeDefinition
@@ -15,10 +11,9 @@ import { writeLines } from "../utils.mjs";
 
 const ChronyServiceTypeDefinition = {
   name: "chrony",
+  extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ExtraSourceServiceTypeDefinition,
-  priority: 0.1,
   key: "name",
   service: {
     extends: ["ntp"],

package/src/services/headscale.mjs

@@ -1,16 +1,11 @@
 import { addType } from "../types.mjs";
-import { ServiceTypeDefinition } from "../service.mjs";
-import {
-  ExtraSourceService,
-  ExtraSourceServiceTypeDefinition
-} from "../extra-source-service.mjs";
+import { ServiceTypeDefinition, Service } from "../service.mjs";
 
 const HeadscaleServiceTypeDefinition = {
   name: "headscale",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ExtraSourceServiceTypeDefinition,
-  priority: 0.1,
   key: "name",
   service: {
     endpoints: [
@@ -30,7 +25,7 @@ const HeadscaleServiceTypeDefinition = {
   }
 };
 
-export class HeadscaleService extends ExtraSourceService {
+export class HeadscaleService extends Service {
   static {
     addType(this);
   }

package/src/services/influxdb.mjs

@@ -7,10 +7,10 @@ import { Service, ServiceTypeDefinition } from "../service.mjs";
 
 const InfluxdbServiceTypeDefinition = {
   name: "influxdb",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
-  priority: 0.1,
+  //: 0.1,
   key: "name",
   attributes: {
     "metrics-disabled": {

package/src/services/kea.mjs

@@ -19,10 +19,9 @@ import { writeLines } from "../utils.mjs";
 
 const KeaServiceTypeDefinition = {
   name: "kea",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
-  priority: 0.1,
   key: "name",
   attributes: {
     "ddns-send-updates": {

package/src/services/mosquitto.mjs

@@ -7,10 +7,9 @@ import { Service, ServiceTypeDefinition } from "../service.mjs";
 
 const MosquittoServiceTypeDefinition = {
   name: "mosquitto",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
-  priority: 0.1,
   key: "name",
   attributes: {
     log_timestamp: {

package/src/services/openldap.mjs

@@ -8,10 +8,9 @@ import { addHook } from "../hooks.mjs";
 
 const OpenLDAPServiceTypeDefinition = {
   name: "openldap",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
-  priority: 0.1,
   key: "name",
   attributes: {
     baseDN: string_attribute_writable,

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

@@ -3,10 +3,9 @@ import { addType } from "../types.mjs";
 
 const SystemdJournalRemoteServiceTypeDefinition = {
   name: "systemd-journal-remote",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
-  priority: 0.1,
   key: "name",
   service: {
     services: {

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

@@ -4,10 +4,9 @@ import { addType } from "../types.mjs";
 
 const SystemdJournalUploadServiceTypeDefinition = {
   name: "systemd-journal-upload",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
-  priority: 0.1,
   key: "name",
   attributes: {
     url: string_attribute_writable

package/src/services/systemd-journal.mjs

@@ -3,10 +3,9 @@ import { addType } from "../types.mjs";
 
 const SystemdJournalServiceTypeDefinition = {
   name: "systemd-journal",
+  extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ServiceTypeDefinition,
-  priority: 0.1,
   key: "name"
 };
 

package/src/services/systemd-resolved.mjs

@@ -8,10 +8,9 @@ import { addType } from "../types.mjs";
 
 const SystemdResolvedServiceTypeDefinition = {
   name: "systemd-resolved",
+  extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ExtraSourceServiceTypeDefinition,
-  priority: 0.1,
   key: "name"
 };
 

package/src/services/systemd-timesyncd.mjs

@@ -11,7 +11,6 @@ const SystemdTimesyncdServiceTypeDefinition = {
   extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1
 };
 
 export class SystemdTimesyncdService extends ExtraSourceService {

package/src/services/tailscale.mjs

@@ -0,0 +1,24 @@
+import { addType } from "../types.mjs";
+import { ServiceTypeDefinition, Service } from "../service.mjs";
+
+export class TailscaleService extends Service {
+  static name = "tailscale";
+  static extends = ServiceTypeDefinition;
+  static specializationOf = ServiceTypeDefinition;
+  static owners = ServiceTypeDefinition.owners;
+  static key = "name";
+  static service = {
+    endpoints: [
+      {
+        family: "IPv4",
+        port: 41641,
+        protocol: "tcp",
+        tls: false
+      }
+    ]
+  };
+
+  /*static {
+    addType(TailscaleService);
+  }*/
+}

package/src/subnet.mjs

@@ -14,7 +14,6 @@ import { addType } from "./types.mjs";
 const SubnetTypeDefinition = {
   name: "subnet",
   owners: ["location", "owner", "network", "root"],
-  priority: 0.6,
   constructWithIdentifierOnly: true,
   key: "address",
   attributes: {

package/src/types.mjs

@@ -7,16 +7,14 @@ import {
 import { addServiceType } from "./service-types.mjs";
 export { types };
 
-export function addType(clazz) {
-  const type = clazz.typeDefinition;
-  type.clazz = clazz;
+export function addType(type) {
+  type = paccAddType(type);
 
   if (type.specializationOf) {
     type.specializationOf.specializations[type.name] = type;
   }
 
   addServiceType(type.service, type.name);
-  paccAddType(type);
 }
 
 export function resolveTypeLinks() {

package/types/cluster.d.mts

@@ -4,7 +4,6 @@ export class Cluster extends Host {
         owners: (string | {
             name: string;
             owners: string[];
-            priority: number;
             extends: {
                 name: string;
                 key: string;
@@ -97,7 +96,6 @@ export class Cluster extends Host {
                     type: {
                         name: string;
                         owners: string[];
-                        priority: number;
                         constructWithIdentifierOnly: boolean;
                         key: string;
                         attributes: {
@@ -166,10 +164,8 @@ export class Cluster extends Host {
                 };
             };
         })[];
-        priority: number;
         extends: {
             name: string;
-            priority: number;
             owners: string[];
             extends: {
                 name: string;