pmcf 3.12.1 → 3.13.0

package/package.json

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

package/src/endpoint.mjs

@@ -10,7 +10,7 @@ class BaseEndpoint {
   }
 
   get type() {
-    return this._type ?? this.service.type;
+    return this._type?.name ?? this.service.type;
   }
 
   get priority()

package/src/service-types.mjs

@@ -105,13 +105,14 @@ export const ServiceTypes = {
     ]
   },
   "dhcpv6-server": { endpoints: [{ family: "IPv6", port: 547, tls: false }] },
-  smb: { endpoints: [{ protocol: "tcp", port: 445, tls: false }] },
-  timemachine: {
-    extends: ["smb"],
+  smb: {
     endpoints: [
       { family: "IPv4", protocol: "tcp", port: 445, tls: false },
       { family: "IPv6", protocol: "tcp", port: 445, tls: false }
-    ],
+    ]
+  },
+  timemachine: {
+    extends: ["smb"],
     dnsRecord: {
       type: "TXT",
       parameters: {
@@ -124,47 +125,69 @@ export const ServiceTypes = {
   }
 };
 
-function prepareEndPoints(type, td) {
-  if (td.endpoints) {
-    td.endpoints.forEach(e => (e.type = type));
+Object.entries(ServiceTypes).forEach(([name, type]) =>
+  addServiceType(type, name)
+);
+
+export function addServiceType(type, name) {
+  if (type) {
+    if (name) {
+      type.name = name;
+    }
+
+    ServiceTypes[type.name] = type;
+    if (type.endpoints) {
+      type.endpoints.forEach(e => (e.type = type));
+    } else {
+      type.endpoints = [];
+    }
+
+    if (type.services) {
+      Object.entries(type.services).forEach(([name, type]) =>
+        addServiceType(type, name)
+      );
+    } else {
+      type.services = {};
+    }
+
+    if (type.extends) {
+      type.extends = type.extends.map(t =>
+        typeof t === "string" ? ServiceTypes[t] : t
+      );
+    } else {
+      type.extends = [];
+    }
   }
+  return type;
 }
 
-Object.entries(ServiceTypes).forEach(([type, td]) =>
-  prepareEndPoints(type, td)
-);
-
-export function addServiceTypes(st) {
-  for (const [type, td] of Object.entries(st)) {
-    ServiceTypes[type] = td;
-    prepareEndPoints(type, td);
+export function serviceTypes(type) {
+  if (type) {
+    let types = new Set([type.name]);
 
-    if (td.services) {
-      addServiceTypes(td.services);
+    for (const t of type.extends) {
+      types = types.union(serviceTypes(t));
     }
+
+    return types;
   }
+  return new Set();
 }
 
 export function serviceTypeEndpoints(type) {
-  let td = ServiceTypes[type];
-  if (td) {
-    const all = td.services
-      ? Object.keys(td.services)
+  if (type) {
+    const all = type.services
+      ? Object.values(type.services)
           .map(type => serviceTypeEndpoints(type))
           .flat()
       : [];
 
-    if (td.extends) {
-      all.push(
-        td.extends.reduce(
-          (a, c) => [...a, ...(ServiceTypes[c]?.endpoints || [])],
-          []
-        )
-      );
+    if (type.extends) {
+      all.push(type.extends.reduce((a, c) => [...a, ...c?.endpoints], []));
     }
 
-    if (td.endpoints) {
-      all.push(td.endpoints);
+    if (type.endpoints) {
+      all.push(type.endpoints);
     }
 
     return all.flat();

package/src/service.mjs

@@ -16,7 +16,11 @@ import {
 import { addType } from "./types.mjs";
 import { asArray } from "./utils.mjs";
 import { networkAddressAttributes } from "./network-support.mjs";
-import { serviceTypeEndpoints, ServiceTypes } from "./service-types.mjs";
+import {
+  serviceTypeEndpoints,
+  serviceTypes,
+  ServiceTypes
+} from "./service-types.mjs";
 import {
   DNSRecord,
   dnsFullName,
@@ -78,7 +82,6 @@ export class Service extends Base {
   _type;
   _port;
   _systemd;
-  _extends = [];
 
   static {
     addType(this);
@@ -92,14 +95,6 @@ export class Service extends Base {
     return `${super.toString()}[${this.type}]`;
   }
 
-  set extends(value) {
-    this._extends.push(value);
-  }
-
-  get extends() {
-    return this._extends;
-  }
-
   get network() {
     return this.host.network;
   }
@@ -127,11 +122,11 @@ export class Service extends Base {
   }
 
   get serviceTypeEndpoints() {
-    return serviceTypeEndpoints(this.type);
+    return serviceTypeEndpoints(ServiceTypes[this.type]);
   }
 
   endpoints(filter) {
-    const data = serviceTypeEndpoints(this.type);
+    const data = serviceTypeEndpoints(ServiceTypes[this.type]);
     if (!data) {
       return [];
     }
@@ -195,7 +190,8 @@ export class Service extends Base {
 
   address(
     options = {
-      endpoints: e => e.networkInterface && e.networkInterface.kind !== "loopbak",
+      endpoints: e =>
+        e.networkInterface && e.networkInterface.kind !== "loopbak",
       select: e => e.domainName || e.address,
       limit: 1,
       join: ""
@@ -224,7 +220,7 @@ export class Service extends Base {
   }
 
   get port() {
-    return this._port ?? serviceTypeEndpoints(this.type)[0].port;
+    return this._port ?? serviceTypeEndpoints(ServiceTypes[this.type])[0].port;
   }
 
   set weight(value) {
@@ -244,7 +240,7 @@ export class Service extends Base {
   }
 
   get types() {
-    return new Set([...this._extendedPropertyIterator("type", new Set())]);
+    return serviceTypes(ServiceTypes[this.type]);
   }
 
   get systemdServices() {
@@ -285,7 +281,7 @@ export class Service extends Base {
       if (parameters) {
         for (const service of this.findServices()) {
           if (service !== this) {
-            const r = ServiceTypes[service.type]?.dnsRecord;
+            const r = ServiceTypes[service.type].dnsRecord;
 
             if (r?.type === dnsRecord.type) {
               parameters = dnsMergeParameters(parameters, r.parameters);

package/src/services/bind.mjs

@@ -76,7 +76,6 @@ const BindServiceTypeDefinition = {
     minimum: { ...string_attribute_writable, default: 60000 },
     allowedUpdates: string_collection_attribute_writable
   },
-
   service: {
     extends: ["dns"],
     services: {
@@ -148,12 +147,6 @@ export class BindService extends ExtraSourceService {
 
     this._systemd = "bind.service";
 
-    // TODO
-    const dns = new Service(owner);
-    dns.name = "dns";
-    dns.type = "dns";
-
-    this._extends.push(dns);
     this.views = {};
 
     for (const name of ["internal", "protected"]) {
@@ -538,7 +531,7 @@ export class BindService extends ExtraSourceService {
         zone.records.add(DNSRecord("location", "TXT", host.location.name));
       }
       for (const na of host.networkAddresses(
-        na => na.networkInterface.kind != "loopback"
+        na => na.networkInterface.kind !== "loopback"
       )) {
         zone.records.add(
           DNSRecord("@", dnsRecordTypeForAddressFamily(na.family), na.address)
@@ -556,9 +549,7 @@ export class BindService extends ExtraSourceService {
   }
 
   get defaultRecords() {
-    const nameService = this.findService(
-      '(type="dns" || type="bind") && priority>=300'
-    ); // TODO bind = dns ?
+    const nameService = this.findService('in("dns",types) && priority>=300');
 
     const SOARecord = DNSRecord(
       "@",

package/src/services/chrony.mjs

@@ -58,7 +58,6 @@ export class ChronyService extends ExtraSourceService {
 
   constructor(owner, data) {
     super(owner, data);
-    this._extends.push(new Service(owner, { name: this.name, type: "ntp" }));
     this._systemd = "chronyd.service";
   }
 
@@ -87,7 +86,7 @@ export class ChronyService extends ExtraSourceService {
 
     const lines = [
       ...serviceEndpoints(this, {
-        services: '(type="ntp" || type="chrony") && priority>=100',
+        services: 'in("ntp",types) && priority>=100',
         endpoints: e =>
           e.type === "ntp" &&
           !isLinkLocal(e.address) &&

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

@@ -8,21 +8,23 @@ const SystemdJournalRemoteServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   priority: 0.1,
   key: "name",
-  services: {
-    endpoints: [
-      {
-        family: "IPv4",
-        port: 19532,
-        protocol: "tcp",
-        tls: false
-      },
-      {
-        family: "IPv6",
-        port: 19532,
-        protocol: "tcp",
-        tls: false
-      }
-    ]
+  service: {
+    services: {
+      endpoints: [
+        {
+          family: "IPv4",
+          port: 19532,
+          protocol: "tcp",
+          tls: false
+        },
+        {
+          family: "IPv6",
+          port: 19532,
+          protocol: "tcp",
+          tls: false
+        }
+      ]
+    }
   }
 };
 

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

@@ -11,8 +11,7 @@ const SystemdJournalUploadServiceTypeDefinition = {
   key: "name",
   attributes: {
     url: string_attribute_writable
-  },
-  service: {}
+  }
 };
 
 export class SystemdJournalUploadService extends Service {

package/src/services/systemd-journal.mjs

@@ -7,8 +7,7 @@ const SystemdJournalServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  key: "name",
-  service: {}
+  key: "name"
 };
 
 export class SystemdJournalService extends Service {

package/src/services/systemd-resolved.mjs

@@ -12,8 +12,7 @@ const SystemdResolvedServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
-  key: "name",
-  service: {}
+  key: "name"
 };
 
 export class SystemdResolvedService extends ExtraSourceService {
@@ -36,7 +35,7 @@ export class SystemdResolvedService extends ExtraSourceService {
   systemdConfigs(name) {
     const options = (lower, upper, limit) => {
       return {
-        services: `(type="dns" || type="bind") && priority>=${lower} && priority<=${upper}`,
+        services: `in("dns",types) && priority>=${lower} && priority<=${upper}`,
         endpoints: e =>
           e.networkInterface &&
           e.networkInterface.kind !== "loopback" &&

package/src/services/systemd-timesyncd.mjs

@@ -11,8 +11,7 @@ const SystemdTimesyncdServiceTypeDefinition = {
   extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  priority: 0.1,
-  service: {}
+  priority: 0.1
 };
 
 export class SystemdTimesyncdService extends ExtraSourceService {
@@ -35,7 +34,7 @@ export class SystemdTimesyncdService extends ExtraSourceService {
   systemdConfigs(name) {
     const options = (lower, upper) => {
       return {
-        services: `(type="ntp" || type="chrony") && priority >= ${lower} && priority <= ${upper}`,
+        services: `in("ntp",types) && priority >= ${lower} && priority <= ${upper}`,
         endpoints: e =>
           e.networkInterface && e.networkInterface.kind !== "loopback",
         select: endpoint => endpoint.address,

package/src/types.mjs

@@ -4,7 +4,7 @@ import {
   oneOfType,
   addType as paccAddType
 } from "pacc";
-import { addServiceTypes } from "./service-types.mjs";
+import { addServiceType } from "./service-types.mjs";
 export { types };
 
 export function addType(clazz) {
@@ -15,10 +15,7 @@ export function addType(clazz) {
     type.specializationOf.specializations[type.name] = type;
   }
 
-  if (type.service) {
-    addServiceTypes({ [type.name]: type.service });
-  }
-
+  addServiceType(type.service, type.name);
   paccAddType(type);
 }
 

package/types/service-types.d.mts

@@ -1,4 +1,5 @@
-export function addServiceTypes(st: any): void;
+export function addServiceType(type: any, name: any): any;
+export function serviceTypes(type: any): Set<any>;
 export function serviceTypeEndpoints(type: any): any;
 export const ServiceTypes: {
     "pacman-repo": {
@@ -157,6 +158,7 @@ export const ServiceTypes: {
     };
     smb: {
         endpoints: {
+            family: string;
             protocol: string;
             port: number;
             tls: boolean;
@@ -164,12 +166,6 @@ export const ServiceTypes: {
     };
     timemachine: {
         extends: string[];
-        endpoints: {
-            family: string;
-            protocol: string;
-            port: number;
-            tls: boolean;
-        }[];
         dnsRecord: {
             type: string;
             parameters: {

package/types/service.d.mts

@@ -670,9 +670,6 @@ export class Service extends Base {
     _type: any;
     _port: any;
     _systemd: any;
-    _extends: any[];
-    set extends(value: any[]);
-    get extends(): any[];
     get host(): Host;
     hosts(): Generator<any, void, any>;
     get domainName(): any;

package/types/services/systemd-journal-remote.d.mts

@@ -813,13 +813,15 @@ export class SystemdJournalRemoteService extends Service {
         };
         priority: number;
         key: string;
-        services: {
-            endpoints: {
-                family: string;
-                port: number;
-                protocol: string;
-                tls: boolean;
-            }[];
+        service: {
+            services: {
+                endpoints: {
+                    family: string;
+                    port: number;
+                    protocol: string;
+                    tls: boolean;
+                }[];
+            };
         };
     };
     get type(): string;

package/types/services/systemd-journal-upload.d.mts

@@ -816,7 +816,6 @@ export class SystemdJournalUploadService extends Service {
         attributes: {
             url: import("pacc").AttributeDefinition;
         };
-        service: {};
     };
     get type(): string;
     get systemdServices(): string;

package/types/services/systemd-journal.d.mts

@@ -813,7 +813,6 @@ export class SystemdJournalService extends Service {
         };
         priority: number;
         key: string;
-        service: {};
     };
     get type(): string;
     get systemdServices(): string;

package/types/services/systemd-resolved.d.mts

@@ -1037,7 +1037,6 @@ export class SystemdResolvedService extends ExtraSourceService {
         };
         priority: number;
         key: string;
-        service: {};
     };
     get systemdServices(): string;
     systemdConfigs(name: any): {

package/types/services/systemd-timesyncd.d.mts

@@ -1036,7 +1036,6 @@ export class SystemdTimesyncdService extends ExtraSourceService {
             };
         })[];
         priority: number;
-        service: {};
     };
     get systemdServices(): string;
     systemdConfigs(name: any): {