pmcf 4.28.10 → 4.29.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.28.10",
+  "version": "4.29.0",
   "publishConfig": {
     "access": "public"
   },
@@ -52,9 +52,9 @@
   "dependencies": {
     "aggregated-map": "^1.0.4",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.0.4",
+    "ip-utilties": "^3.1.0",
     "npm-pkgbuild": "^20.7.3",
-    "pacc": "^9.3.2",
+    "pacc": "^9.3.3",
     "package-directory": "^8.2.0"
   },
   "devDependencies": {

package/src/cluster.mjs

@@ -1,5 +1,6 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
+import { FAMILY_IPV4 } from "ip-utilties";
 import {
   default_attribute_writable,
   default_attribute,
@@ -123,7 +124,7 @@ export class Cluster extends Host {
         )) {
           cfg.push(
             `  ${
-              na.family === "IPv4"
+              na.family === FAMILY_IPV4
                 ? "virtual_ipaddress"
                 : "virtual_ipaddress_excluded"
             } {`

package/src/dns-utils.mjs

@@ -50,9 +50,9 @@ export function dnsFullName(name) {
 
 export function dnsRecordTypeForAddressFamily(family) {
   switch (family) {
-    case "IPv4":
+    case FAMILY_IPV4:
       return "A";
-    case "IPv6":
+    case FAMILY_IPV6:
       return "AAAA";
   }
 }

package/src/endpoint.mjs

@@ -1,3 +1,4 @@
+import { FAMILY_IPV6 } from "ip-utilties";
 import { addType } from "pacc";
 import { endpointAttributes, Service } from "./service.mjs";
 
@@ -146,7 +147,7 @@ export class HTTPEndpoint extends BaseEndpoint {
       this.family = address.family;
       this.url = new URL(
         (data.tls ? "https://" : "http://") +
-          (address.family === "IPv6"
+          (address.family === FAMILY_IPV6
             ? "[" + address.address + "]"
             : address.address) +
           ":" +

package/src/host.mjs

@@ -27,7 +27,6 @@ import { generateKnownHosts } from "./host-utils.mjs";
 export class Host extends ServiceOwner {
   static name = "host";
   static priority = 1.9;
-  static owners = ["owner", "network", "root"];
   static attributes = {
     ...networkAddressAttributes,
     networkInterfaces: {
@@ -75,7 +74,7 @@ export class Host extends ServiceOwner {
     replaces: string_set_attribute_writable,
     depends: string_set_attribute_writable,
     provides: string_set_attribute_writable,
-    extends: { ...default_attribute_writable, type: "host", collection: true, owner: false },
+    extends: { ...default_attribute_writable, type: Host, collection: true, owner: false },
     model: string_attribute,
     isModel: boolean_attribute_false
   };

package/src/module.mjs

@@ -1,3 +1,4 @@
+export * from "./type.mjs";
 export * from "./base.mjs";
 export * from "./cluster.mjs";
 export * from "./owner.mjs";

package/src/owner.mjs

@@ -1,4 +1,4 @@
-import { normalizeCIDR, familyIP } from "ip-utilties";
+import { normalizeCIDR, familyIP, FAMILY_IPV4 } from "ip-utilties";
 import {
   default_attribute_writable,
   string_set_attribute_writable,
@@ -12,6 +12,7 @@ import { asIterator, union } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
 import { networks_attribute } from "./network-support.mjs";
+import { Host } from "./host.mjs";
 
 const EMPTY = new Map();
 
@@ -23,7 +24,7 @@ export class Owner extends Base {
     networks: networks_attribute,
     hosts: {
       ...default_attribute_writable,
-      type: "host",
+      type: Host,
       collection: true
     },
     clusters: {
@@ -40,7 +41,10 @@ export class Owner extends Base {
     domain: string_attribute_writable,
     domains: string_set_attribute_writable,
     timezone: string_attribute_writable,
-    architectures: string_set_attribute_writable,
+    architectures: {
+      ...string_set_attribute_writable,
+      description: "all supported architectures"
+    },
     locales: { ...string_set_attribute_writable, description: "unix locale" },
     administratorEmail: { ...email_attribute, writable: true },
     template: { ...boolean_attribute_writable, private: true }
@@ -193,7 +197,7 @@ export class Owner extends Base {
 
     if (!subnet) {
       subnet =
-        familyIP(address) === "IPv4" ? SUBNET_GLOBAL_IPV4 : SUBNET_GLOBAL_IPV6;
+        familyIP(address) === FAMILY_IPV4 ? SUBNET_GLOBAL_IPV4 : SUBNET_GLOBAL_IPV6;
 
       this.error(
         `Address without subnet ${address}`,

package/src/service-types.mjs

@@ -1,3 +1,5 @@
+import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
+
 export const ServiceTypes = {
   "alpm-repo": {
     extends: ["https"]
@@ -6,25 +8,25 @@ export const ServiceTypes = {
     endpoints: [
       {
         protocol: "udp",
-        family: "IPv4",
+        family: FAMILY_IPV4,
         port: 514,
         tls: false
       },
       {
         protocol: "udp",
-        family: "IPv6",
+        family: FAMILY_IPV6,
         port: 514,
         tls: false
       },
       {
         protocol: "tcp",
-        family: "IPv4",
+        family: FAMILY_IPV4,
         port: 514,
         tls: false
       },
       {
         protocol: "tcp",
-        family: "IPv6",
+        family: FAMILY_IPV6,
         port: 514,
         tls: false
       }
@@ -32,52 +34,52 @@ export const ServiceTypes = {
   },
   mqtt: {
     endpoints: [
-      { family: "IPv4", protocol: "tcp", port: 1883, tls: false },
-      { family: "IPv6", protocol: "tcp", port: 1883, tls: false }
+      { family: FAMILY_IPV4, protocol: "tcp", port: 1883, tls: false },
+      { family: FAMILY_IPV6, protocol: "tcp", port: 1883, tls: false }
     ]
   },
   "secure-mqtt": {
     endpoints: [
-      { family: "IPv4", protocol: "tcp", port: 8883, tls: true },
-      { family: "IPv6", protocol: "tcp", port: 8883, tls: true }
+      { family: FAMILY_IPV4, protocol: "tcp", port: 8883, tls: true },
+      { family: FAMILY_IPV6, protocol: "tcp", port: 8883, tls: true }
     ]
   },
   ntp: {
     endpoints: [
-      { family: "IPv4", protocol: "udp", port: 123, tls: false },
-      { family: "IPv6", protocol: "udp", port: 123, tls: false }
+      { family: FAMILY_IPV4, protocol: "udp", port: 123, tls: false },
+      { family: FAMILY_IPV6, protocol: "udp", port: 123, tls: false }
     ]
   },
   dns: {
     endpoints: [
-      { family: "IPv4", protocol: "udp", port: 53, tls: false },
-      { family: "IPv6", protocol: "udp", port: 53, tls: false }
+      { family: FAMILY_IPV4, protocol: "udp", port: 53, tls: false },
+      { family: FAMILY_IPV6, protocol: "udp", port: 53, tls: false }
     ]
   },
   mdns: {
     endpoints: [
-      { family: "IPv4", protocol: "udp", port: 5353, tls: false },
-      { family: "IPv6", protocol: "udp", port: 5353, tls: false }
+      { family: FAMILY_IPV4, protocol: "udp", port: 5353, tls: false },
+      { family: FAMILY_IPV6, protocol: "udp", port: 5353, tls: false }
     ]
   },
   llmnr: {
     endpoints: [
-      { family: "IPv4", protocol: "udp", port: 5355, tls: false },
-      { family: "IPv4", protocol: "tcp", port: 5355, tls: false },
-      { family: "IPv6", protocol: "udp", port: 5355, tls: false },
-      { family: "IPv6", protocol: "tcp", port: 5355, tls: false }
+      { family: FAMILY_IPV4, protocol: "udp", port: 5355, tls: false },
+      { family: FAMILY_IPV4, protocol: "tcp", port: 5355, tls: false },
+      { family: FAMILY_IPV6, protocol: "udp", port: 5355, tls: false },
+      { family: FAMILY_IPV6, protocol: "tcp", port: 5355, tls: false }
     ]
   },
   ldap: {
     endpoints: [
-      { family: "IPv4", scheme: "ldap", protocol: "tcp", port: 389, tls: false },
-      { family: "IPv6", scheme: "ldap", protocol: "tcp", port: 389, tls: false }
+      { family: FAMILY_IPV4, scheme: "ldap", protocol: "tcp", port: 389, tls: false },
+      { family: FAMILY_IPV6, scheme: "ldap", protocol: "tcp", port: 389, tls: false }
     ]
   },
   ldaps: {
     endpoints: [
-      { family: "IPv4", scheme: "ldaps", protocol: "tcp", port: 636, tls: true },
-      { family: "IPv6", scheme: "ldaps", protocol: "tcp", port: 636, tls: true }
+      { family: FAMILY_IPV4, scheme: "ldaps", protocol: "tcp", port: 636, tls: true },
+      { family: FAMILY_IPV6, scheme: "ldaps", protocol: "tcp", port: 636, tls: true }
     ]
   },
   ldapi: {
@@ -85,21 +87,21 @@ export const ServiceTypes = {
   },
   http: {
     endpoints: [
-      { family: "IPv4", scheme: "http", protocol: "tcp", port: 80, tls: false },
-      { family: "IPv6", scheme: "http", protocol: "tcp", port: 80, tls: false }
+      { family: FAMILY_IPV4, scheme: "http", protocol: "tcp", port: 80, tls: false },
+      { family: FAMILY_IPV6, scheme: "http", protocol: "tcp", port: 80, tls: false }
     ]
   },
   https: {
     endpoints: [
-      { family: "IPv4", scheme: "https", protocol: "tcp", port: 443, tls: true },
-      { family: "IPv6", scheme: "https", protocol: "tcp", port: 443, tls: true }
+      { family: FAMILY_IPV4, scheme: "https", protocol: "tcp", port: 443, tls: true },
+      { family: FAMILY_IPV6, scheme: "https", protocol: "tcp", port: 443, tls: true }
     ],
     dnsRecord: { type: "HTTPS", parameters: { alpn: "h2" } }
   },
   http3: {
     endpoints: [
-      { family: "IPv4", scheme: "https", protocol: "udp", port: 443, tls: true },
-      { family: "IPv6", scheme: "https", protocol: "udp", port: 443, tls: true }
+      { family: FAMILY_IPV4, scheme: "https", protocol: "udp", port: 443, tls: true },
+      { family: FAMILY_IPV6, scheme: "https", protocol: "udp", port: 443, tls: true }
     ],
     dnsRecord: {
       type: "HTTPS",
@@ -108,64 +110,64 @@ export const ServiceTypes = {
   },
   rtsp: {
     endpoints: [
-      { family: "IPv4", protocol: "tcp", port: 554, tls: false },
-      { family: "IPv6", protocol: "tcp", port: 554, tls: false }
+      { family: FAMILY_IPV4, protocol: "tcp", port: 554, tls: false },
+      { family: FAMILY_IPV6, protocol: "tcp", port: 554, tls: false }
     ]
   },
   smtp: {
     endpoints: [
-      { family: "IPv4", protocol: "tcp", port: 25, tls: false },
-      { family: "IPv6", protocol: "tcp", port: 25, tls: false }
+      { family: FAMILY_IPV4, protocol: "tcp", port: 25, tls: false },
+      { family: FAMILY_IPV6, protocol: "tcp", port: 25, tls: false }
     ],
     dnsRecord: { type: "MX" }
   },
   submission: {
     endpoints: [
-      { family: "IPv4", protocol: "tcp", port: 587, tls: false },
-      { family: "IPv6", protocol: "tcp", port: 587, tls: false }
+      { family: FAMILY_IPV4, protocol: "tcp", port: 587, tls: false },
+      { family: FAMILY_IPV6, protocol: "tcp", port: 587, tls: false }
     ]
   },
   lmtp: {
     endpoints: [
-      { family: "IPv4", protocol: "tcp", port: 24, tls: false },
-      { family: "IPv6", protocol: "tcp", port: 24, tls: false }
+      { family: FAMILY_IPV4, protocol: "tcp", port: 24, tls: false },
+      { family: FAMILY_IPV6, protocol: "tcp", port: 24, tls: false }
     ]
   },
   ssh: {
     endpoints: [
-      { family: "IPv4", protocol: "tcp", port: 22, tls: false },
-      { family: "IPv6", protocol: "tcp", port: 22, tls: false }
+      { family: FAMILY_IPV4, protocol: "tcp", port: 22, tls: false },
+      { family: FAMILY_IPV6, protocol: "tcp", port: 22, tls: false }
     ]
   },
   imap: {
     endpoints: [
-      { family: "IPv4", protocol: "tcp", port: 143, tls: false },
-      { family: "IPv6", protocol: "tcp", port: 143, tls: false }
+      { family: FAMILY_IPV4, protocol: "tcp", port: 143, tls: false },
+      { family: FAMILY_IPV6, protocol: "tcp", port: 143, tls: false }
     ]
   },
   imaps: {
     endpoints: [
-      { family: "IPv4", protocol: "tcp", port: 993, tls: true },
-      { family: "IPv6", protocol: "tcp", port: 993, tls: true }
+      { family: FAMILY_IPV4, protocol: "tcp", port: 993, tls: true },
+      { family: FAMILY_IPV6, protocol: "tcp", port: 993, tls: true }
     ]
   },
   dhcp: {
     endpoints: [
-      { family: "IPv4", protocol: "udp", port: 547, tls: false },
-      { family: "IPv6", protocol: "udp", port: 547, tls: false }
+      { family: FAMILY_IPV4, protocol: "udp", port: 547, tls: false },
+      { family: FAMILY_IPV6, protocol: "udp", port: 547, tls: false }
     ]
   },
   "dhcpv6-client": {
     endpoints: [
-      { family: "IPv6", protocol: "tcp", port: 546, tls: false },
-      { family: "IPv6", protocol: "udp", port: 546, tls: false }
+      { family: FAMILY_IPV6, protocol: "tcp", port: 546, tls: false },
+      { family: FAMILY_IPV6, protocol: "udp", port: 546, tls: false }
     ]
   },
-  "dhcpv6-server": { endpoints: [{ family: "IPv6", port: 547, tls: false }] },
+  "dhcpv6-server": { endpoints: [{ family: FAMILY_IPV6, port: 547, tls: false }] },
   smb: {
     endpoints: [
-      { family: "IPv4", protocol: "tcp", port: 445, tls: false },
-      { family: "IPv6", protocol: "tcp", port: 445, tls: false }
+      { family: FAMILY_IPV4, protocol: "tcp", port: 445, tls: false },
+      { family: FAMILY_IPV6, protocol: "tcp", port: 445, tls: false }
     ]
   },
   timemachine: {
@@ -183,15 +185,15 @@ export const ServiceTypes = {
   pcp: {
     // rfc6887
     endpoints: [
-      { family: "IPv4", protocol: "udp", port: 5351, tls: false },
-      { family: "IPv6", protocol: "udp", port: 5351, tls: false }
+      { family: FAMILY_IPV4, protocol: "udp", port: 5351, tls: false },
+      { family: FAMILY_IPV6, protocol: "udp", port: 5351, tls: false }
     ]
   },
   "pcp-multicast": {
     // rfc6887
     endpoints: [
-      { family: "IPv4", protocol: "udp", port: 5350, tls: false },
-      { family: "IPv6", protocol: "udp", port: 5350, tls: false }
+      { family: FAMILY_IPV4, protocol: "udp", port: 5350, tls: false },
+      { family: FAMILY_IPV6, protocol: "udp", port: 5350, tls: false }
     ]
   }
 };

package/src/service.mjs

@@ -1,3 +1,4 @@
+import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import {
   string_attribute_writable,
   number_attribute_writable,
@@ -136,8 +137,8 @@ export class Service extends Base {
 
         case undefined:
         case "dns":
-        case "IPv4":
-        case "IPv6":
+        case FAMILY_IPV4:
+        case FAMILY_IPV6:
           const options =
             this._port === undefined ? { ...e } : { ...e, port: this._port };
           delete options.kind;

package/src/services/alpm.mjs

@@ -1,12 +1,10 @@
 import {
-  addType,
   default_attribute_writable,
   name_attribute_writable,
   string_attribute_writable,
   string_set_attribute_writable
 } from "pacc";
-import { addServiceType, Base } from "pmcf";
-import { Service } from "../service.mjs";
+import { addType, Service, Base } from "pmcf";
 
 class alpm_repository extends Base {
   static attributes = {
@@ -36,7 +34,6 @@ export class alpm extends Service {
 
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 
   repositories = new Map();

package/src/services/bind.mjs

@@ -1,9 +1,8 @@
 import { join, dirname } from "node:path";
 import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
-import { isLinkLocal, reverseArpa } from "ip-utilties";
+import { isLinkLocal, reverseArpa, FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import {
-  addType,
   default_attribute_writable,
   duration_attribute_writable,
   string_set_attribute_writable,
@@ -13,12 +12,13 @@ import {
   name_attribute_writable
 } from "pacc";
 import {
+  Service,
   Base,
   ExtraSourceService,
   serviceEndpoints,
   addresses,
   networkAddressType,
-  addServiceType
+  addType
 } from "pmcf";
 import { yesno, writeLines, asArray } from "../utils.mjs";
 import {
@@ -27,7 +27,6 @@ import {
   dnsRecordTypeForAddressFamily,
   sortZoneRecords
 } from "../dns-utils.mjs";
-import { Service } from "../service.mjs";
 import { addHook } from "../hooks.mjs";
 
 const bindNetworkAddressTypes = networkAddressType + "|bind_group";
@@ -417,7 +416,7 @@ export class bind extends ExtraSourceService {
       "bind-statistics": {
         endpoints: [
           {
-            family: "IPv4",
+            family: FAMILY_IPV4,
             port: 19521,
             protocol: "tcp",
             pathname: "/",
@@ -425,7 +424,7 @@ export class bind extends ExtraSourceService {
             kind: "loopback"
           },
           {
-            family: "IPv6",
+            family: FAMILY_IPV6,
             port: 19521,
             protocol: "tcp",
             pathname: "/",
@@ -437,7 +436,7 @@ export class bind extends ExtraSourceService {
       "bind-rdnc": {
         endpoints: [
           {
-            family: "IPv4",
+            family: FAMILY_IPV4,
             port: 953,
             protocol: "tcp",
             tls: false,
@@ -450,7 +449,6 @@ export class bind extends ExtraSourceService {
 
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 
   groups = {};

package/src/services/chrony.mjs

@@ -1,9 +1,8 @@
 import { join } from "node:path";
+import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal } from "ip-utilties";
-import { addType } from "pacc";
-import { addServiceType, ExtraSourceService } from "pmcf";
-import { Service, serviceEndpoints } from "../service.mjs";
+import { Service, serviceEndpoints, addType, ExtraSourceService } from "pmcf";
 import { writeLines } from "../utils.mjs";
 
 export class chrony extends ExtraSourceService {
@@ -15,13 +14,13 @@ export class chrony extends ExtraSourceService {
       "chrony-cmd": {
         endpoints: [
           {
-            family: "IPv4",
+            family: FAMILY_IPV4,
             port: 323,
             protocol: "tcp",
             tls: false
           },
           {
-            family: "IPv6",
+            family: FAMILY_IPV6,
             port: 323,
             protocol: "tcp",
             tls: false
@@ -37,7 +36,6 @@ export class chrony extends ExtraSourceService {
 
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 
   async *preparePackages(dir) {
@@ -65,7 +63,7 @@ export class chrony extends ExtraSourceService {
           if (endpoint.isPool) {
             options.push("maxsources 2");
           }
-          if (endpoint.priority > 300 && endpoint.family === "IPv4") {
+          if (endpoint.priority > 300 && endpoint.family === FAMILY_IPV4) {
             options.push("prefer");
           }
           return options.join(" ");

package/src/services/headscale.mjs

@@ -1,6 +1,5 @@
-import { addType } from "pacc";
-import { addServiceType } from "pmcf";
-import { Service } from "../service.mjs";
+import { FAMILY_IPV4 } from "ip-utilties";
+import { Service, addType } from "pmcf";
 
 export class headscale extends Service {
   static specializationOf = Service;
@@ -11,21 +10,21 @@ export class headscale extends Service {
         path: "/run/headscale/headscale.sock"
       },
       {
-        family: "IPv4",
+        family: FAMILY_IPV4,
         port: 8080,
         protocol: "tcp",
         tls: false
       },
       {
         description: "grpc",
-        family: "IPv4",
+        family: FAMILY_IPV4,
         port: 50443,
         protocol: "tcp",
         tls: false
       },
       {
         description: "metrics debug",
-        family: "IPv4",
+        family: FAMILY_IPV4,
         port: 9090,
         protocol: "tcp",
         tls: false
@@ -34,6 +33,5 @@ export class headscale extends Service {
   };
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 }

package/src/services/influxdb.mjs

@@ -1,13 +1,13 @@
 import { join } from "node:path";
+import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import { FileContentProvider } from "npm-pkgbuild";
-import { boolean_attribute_writable_true, addType } from "pacc";
-import { addServiceType } from "pmcf";
+import { boolean_attribute_writable_true } from "pacc";
+import { Service, addType } from "pmcf";
 import {
   writeLines,
   setionLinesFromPropertyIterator,
   filterConfigurable
 } from "../utils.mjs";
-import { Service } from "../service.mjs";
 
 export class influxdb extends Service {
   static specializationOf = Service;
@@ -21,14 +21,14 @@ export class influxdb extends Service {
   static service = {
     endpoints: [
       {
-        family: "IPv4",
+        family: FAMILY_IPV4,
         port: 8086,
         protocol: "tcp",
         tls: false,
         pathname: "/"
       },
       {
-        family: "IPv6",
+        family: FAMILY_IPV6,
         port: 8086,
         protocol: "tcp",
         tls: false,
@@ -39,7 +39,6 @@ export class influxdb extends Service {
 
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 
   async *preparePackages(dir) {

package/src/services/kea.mjs

@@ -1,14 +1,13 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { reverseArpa, isLinkLocal } from "ip-utilties";
+import { reverseArpa, isLinkLocal, FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import {
   string_attribute_writable,
   number_attribute_writable,
-  boolean_attribute_writable_true,
-  addType
+  boolean_attribute_writable_true
 } from "pacc";
 import {
-  addServiceType,
+  addType,
   Service,
   sortDescendingByPriority,
   serviceEndpoints,
@@ -54,7 +53,7 @@ export class kea extends Service {
       "kea-ddns": {
         endpoints: [
           {
-            family: "IPv4",
+            family: FAMILY_IPV4,
             kind: "loopback",
             port: 53001,
             protocol: "tcp",
@@ -65,7 +64,7 @@ export class kea extends Service {
       /*"kea-control-agent": {
         endpoints: [
           {
-            family: "IPv4",
+            family: FAMILY_IPV4,
             port: 53002,
             pathname: "/",
             protocol: "tcp",
@@ -76,7 +75,7 @@ export class kea extends Service {
       "kea-ha-4": {
         endpoints: [
           {
-            family: "IPv4",
+            family: FAMILY_IPV4,
             port: 53003,
             pathname: "/",
             protocol: "tcp",
@@ -87,7 +86,7 @@ export class kea extends Service {
       "kea-ha-6": {
         endpoints: [
           {
-            family: "IPv6",
+            family: FAMILY_IPV6,
             port: 53004,
             pathname: "/",
             protocol: "tcp",
@@ -124,7 +123,6 @@ export class kea extends Service {
 
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 
   async *preparePackages(dir) {
@@ -254,9 +252,7 @@ export class kea extends Service {
         ]
       };
 
-      for (const [key] of Object.entries(
-        KeaService.attributes
-      ).filter(
+      for (const [key] of Object.entries(KeaService.attributes).filter(
         ([key, attribute]) => attribute.configurable && this[key] !== undefined
       )) {
         cfg[key] = this[key];
@@ -291,7 +287,7 @@ export class kea extends Service {
           name,
           "dns-servers": dnsServerEndpoints
             .filter(
-              endpoint => endpoint.family === "IPv4" && endpoint.type === "dns"
+              endpoint => endpoint.family === FAMILY_IPV4 && endpoint.type === "dns"
             )
             .map(endpoint => {
               return { "ip-address": endpoint.address };
@@ -399,7 +395,7 @@ export class kea extends Service {
         subnet4: subnets
           .filter(
             s =>
-              s.family === "IPv4" &&
+              s.family === FAMILY_IPV4 &&
               // TODO keep out tailscale
               s.cidr !== "100.64.0.2/32" &&
               s.cidr !== "100.64.0.3/32"
@@ -426,7 +422,7 @@ export class kea extends Service {
         subnet6: subnets
           .filter(
             s =>
-              s.family === "IPv6" &&
+              s.family === FAMILY_IPV6 &&
               !isLinkLocal(s.address) &&
               // TODO keep out tailscale
               s.cidr !== "fd7a:115c:a1e0::/64"

package/src/services/mosquitto.mjs

@@ -1,6 +1,5 @@
-import { port_attribute, string_attribute_writable, addType } from "pacc";
-import { addServiceType } from "pmcf";
-import { Service } from "../service.mjs";
+import { port_attribute, string_attribute_writable } from "pacc";
+import { Service, addType } from "pmcf";
 
 export class mosquitto extends Service {
   static specializationOf = Service;
@@ -29,7 +28,6 @@ export class mosquitto extends Service {
 
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 
   get listener() {

package/src/services/openldap.mjs

@@ -1,6 +1,5 @@
-import { string_attribute_writable, addType } from "pacc";
-import { addServiceType } from "pmcf";
-import { Service } from "../service.mjs";
+import { string_attribute_writable } from "pacc";
+import { Service, addType } from "pmcf";
 
 export class openldap extends Service {
   static specializationOf = Service;
@@ -16,7 +15,6 @@ export class openldap extends Service {
 
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 
   _base;
@@ -43,7 +41,9 @@ export class openldap extends Service {
 
     const packageData = this.packageData;
 
-    console.log([...this.walkDirections(["this", "extends"]) ].map(n=>n.fullName));
+    console.log(
+      [...this.walkDirections(["this", "extends"])].map(n => n.fullName)
+    );
 
     packageData.sources = await Array.fromAsync(
       this.templateContent(

package/src/services/postfix.mjs

@@ -1,6 +1,4 @@
-import { addType } from "pacc";
-import { addServiceType } from "pmcf";
-import { Service } from "../service.mjs";
+import { Service, addType } from "pmcf";
 
 export class postfix extends Service {
   static specializationOf = Service;
@@ -13,7 +11,5 @@ export class postfix extends Service {
 
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
-
 }

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

@@ -1,11 +1,11 @@
+import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import {
-  addType,
   string_attribute_writable,
   string_collection_attribute_writable,
   boolean_attribute_writable,
   integer_attribute_writable
 } from "pacc";
-import { Service, addServiceType } from "pmcf";
+import { Service, addType } from "pmcf";
 import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 /**
@@ -66,14 +66,14 @@ export class SystemdJournalRemoteService extends Service {
     systemdService: "systemd-journal-remote.service",
     endpoints: [
       {
-        family: "IPv4",
+        family: FAMILY_IPV4,
         port: 19532,
         protocol: "tcp",
         tls: false,
         pathname: "/"
       },
       {
-        family: "IPv6",
+        family: FAMILY_IPV6,
         port: 19532,
         protocol: "tcp",
         tls: false,
@@ -84,7 +84,6 @@ export class SystemdJournalRemoteService extends Service {
 
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 
   get type() {

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

@@ -1,10 +1,9 @@
 import {
   string_attribute_writable,
   string_collection_attribute_writable,
-  boolean_attribute_writable,
-  addType
+  boolean_attribute_writable
 } from "pacc";
-import { Service, addServiceType } from "pmcf";
+import { Service, addType } from "pmcf";
 import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 /**
@@ -48,7 +47,6 @@ export class SystemdJournalUploadService extends Service {
   };
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 
   get type() {

package/src/services/systemd-journald.mjs

@@ -1,9 +1,5 @@
-import {
-  addType,
-  string_attribute_writable,
-  duration_attribute_writable
-} from "pacc";
-import { Service, addServiceType } from "pmcf";
+import { string_attribute_writable, duration_attribute_writable } from "pacc";
+import { Service, addType } from "pmcf";
 import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 export class SystemdJournaldService extends Service {
@@ -108,7 +104,6 @@ export class SystemdJournaldService extends Service {
   };
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 
   get type() {

package/src/services/systemd-resolved.mjs

@@ -1,17 +1,12 @@
+import { FAMILY_IPV4 } from "ip-utilties";
 import {
-  addType,
   string_collection_attribute_writable,
   duration_attribute_writable,
   string_attribute_writable,
   boolean_attribute_writable,
   yesno_attribute_writable
 } from "pacc";
-import {
-  ExtraSourceService,
-  serviceEndpoints,
-  addServiceType,
-  Service
-} from "pmcf";
+import { ExtraSourceService, serviceEndpoints, addType, Service } from "pmcf";
 import {
   filterConfigurable,
   yesno,
@@ -73,7 +68,6 @@ export class SystemdResolvedService extends ExtraSourceService {
 
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 
   systemdConfigs(name) {
@@ -81,7 +75,7 @@ export class SystemdResolvedService extends ExtraSourceService {
       return {
         services: `services[types[dns] && priority>=${lower} && priority<=${upper}]`,
         endpoints: e =>
-          e.family == "IPv4" &&
+          e.family == FAMILY_IPV4 &&
           e.networkInterface &&
           e.networkInterface.kind !== "loopback",
         //e.family !== "dns",

package/src/services/systemd-timesyncd.mjs

@@ -1,14 +1,5 @@
-import {
-  addType,
-  string_attribute_writable,
-  duration_attribute_writable
-} from "pacc";
-import {
-  ExtraSourceService,
-  Service,
-  serviceEndpoints,
-  addServiceType
-} from "pmcf";
+import { string_attribute_writable, duration_attribute_writable } from "pacc";
+import { ExtraSourceService, Service, serviceEndpoints, addType } from "pmcf";
 import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 export class SystemdTimesyncdService extends ExtraSourceService {
@@ -30,7 +21,6 @@ export class SystemdTimesyncdService extends ExtraSourceService {
 
   static {
     addType(this);
-    addServiceType(this.service, this.name);
   }
 
   systemdConfigs(name) {

package/src/services/tailscale.mjs

@@ -1,12 +1,12 @@
-import { addType } from "pacc";
-import { Service } from "../service.mjs";
+import { FAMILY_IPV4 } from "ip-utilties";
+import { Service, addType } from "pmcf";
 
 export class tailscale extends Service {
   static specializationOf = Service;
   static service = {
     endpoints: [
       {
-        family: "IPv4",
+        family: FAMILY_IPV4,
         port: 41641,
         protocol: "tcp",
         tls: false

package/src/subnet.mjs

@@ -70,7 +70,7 @@ export class Subnet extends Base {
     /* TODO where to take values from ? */
 
     return [
-      this.family === "IPv6"
+      this.family === FAMILY_IPV6
         ? this.cidr
         : rangeIP(this.prefix, this.prefixLength, 51, 6).map(a => decodeIP(a))
     ];

package/src/type.mjs

@@ -0,0 +1,10 @@
+import { addType as addTypeBasic } from "pacc";
+import { addServiceType } from "pmcf";
+
+export function addType(type) {
+  addTypeBasic(type);
+
+  if (type.service) {
+    addServiceType(type.service, type.name);
+  }
+}