pmcf 2.34.0 → 2.35.1

package/package.json

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

package/src/endpoint.mjs

@@ -17,6 +17,10 @@ export class Endpoint {
     return this.networkAddress.networkInterface.hostName;
   }
 
+  get domainName() {
+    return this.networkAddress.networkInterface.domainName;
+  }
+
   get address() {
     return this.networkAddress.address;
   }
@@ -29,3 +33,23 @@ export class Endpoint {
     return this.networkAddress.networkInterface;
   }
 }
+
+export class DomainNameEndpoint {
+  constructor(service, domainName, data) {
+    this.service = service;
+    this.domainName = domainName;
+    Object.assign(this, data);
+  }
+
+  get networkInterface() {
+    return {};
+  }
+
+  get address() {
+    return this.domainName;
+  }
+
+  toString() {
+    return `${this.address}[${this.port}]`;
+  }
+}

package/src/network-interfaces/skeleton.mjs

@@ -42,6 +42,10 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     return this;
   }
 
+  get domainName() {
+    return this.host?.domainName;
+  }
+
   get domainNames() {
     return new Set();
   }

package/src/service.mjs

@@ -1,5 +1,4 @@
-import { isLocalhost } from "ip-utilties";
-import { Base, Host, Endpoint } from "pmcf";
+import { Base, Host, Endpoint, DomainNameEndpoint } from "pmcf";
 import { addType } from "./types.mjs";
 import { asArray } from "./utils.mjs";
 import { networkAddressProperties } from "./network-support.mjs";
@@ -11,11 +10,6 @@ import {
 } from "./dns-utils.mjs";
 
 const ServiceTypes = {
-  "systemd-resolved": { endpoints: [] },
-  "systemd-timesyncd": { endpoints: [] },
-  "systemd-journal": { endpoints: [] },
-  "systemd-journal-remote": { endpoints: [] },
-  "systemd-journal-upload": { endpoints: [] },
   ntp: { endpoints: [{ protocol: "udp", port: 123, tls: false }] },
   dns: { endpoints: [{ protocol: "udp", port: 53, tls: false }] },
   ldap: { endpoints: [{ protocol: "tcp", port: 389, tls: false }] },
@@ -199,7 +193,7 @@ export class Service extends Base {
       }
     ];
 
-    const result = [...this.host.networkAddresses()]
+    let result = [...this.host.networkAddresses()]
       .map(na =>
         data.map(
           d =>
@@ -211,6 +205,12 @@ export class Service extends Base {
       )
       .flat();
 
+    if (result.length === 0) {
+      result = data.map(
+        d => new DomainNameEndpoint(this, this.domainName, { ...d, ...local })
+      );
+    }
+
     return filter ? result.filter(filter) : result;
   }
 
@@ -322,26 +322,15 @@ export class Service extends Base {
 
 export const sortByPriority = (a, b) => a.priority - b.priority;
 
-export function serviceAddresses(
-  sources,
-  filter,
-  addressType = "addresses",
-  addressFilter = a => !isLocalhost(a)
-) {
-  return asArray(sources)
-    .map(ft => Array.from(ft.findServices(filter)))
+export function serviceEndpoints(sources, options = {}) {
+  const all = asArray(sources)
+    .map(ft => Array.from(ft.findServices(options.services)))
     .flat()
     .sort(sortByPriority)
-    .map(s => s[addressType])
-    .flat()
-    .filter(addressFilter);
-}
-
-export function serviceEndpoints(sources, filter, endpointFilter) {
-  return asArray(sources)
-    .map(ft => Array.from(ft.findServices(filter)))
-    .flat()
-    .sort(sortByPriority)
-    .map(service => service.endpoints(endpointFilter))
+    .map(service => service.endpoints(options.endpoints))
     .flat();
+
+  const res = new Set(options.select ? all.map(options.select) : all);
+
+  return options.join ? [...res].join(options.join) : res;
 }

package/src/services/dhcp.mjs

@@ -70,14 +70,13 @@ export class DHCPService extends Service {
 
     console.log("kea", host.name, network.name);
 
-    const dnsServerEndpoints = serviceEndpoints(
-      network,
-      {
+    const dnsServerEndpoints = serviceEndpoints(network, {
+      services: {
         type: "dns",
         priority: "<10"
       },
-      endpoint => endpoint.networkInterface.kind !== "loopback"
-    );
+      endpoints: endpoint => endpoint.networkInterface.kind !== "loopback"
+    });
 
     const packageData = {
       dir,

package/src/services/dns.mjs

@@ -87,8 +87,6 @@ const statisticsEndpoint = {
   tls: false
 };
 
-const DNS_SERVICE_FILTER = { type: DNSServiceTypeDefinition.name };
-
 function addressList(objects) {
   return Array.from(objects).map(object => {
     switch (typeof object) {
@@ -222,9 +220,10 @@ export class DNSService extends ExtraSourceService {
       }
     };
 
-    const forwarders = new Set(
-      serviceEndpoints(this.source, DNS_SERVICE_FILTER).map(e => e.address)
-    );
+    const forwarders = serviceEndpoints(this.source, {
+      services: { type: "dns", priority: ">=20" },
+      select: e => e.address
+    });
 
     if (forwarders.size) {
       await writeLines(
@@ -283,7 +282,7 @@ export class DNSService extends ExtraSourceService {
 
 async function generateZoneDefs(dns, location, packageData) {
   const ttl = dns.recordTTL;
-  const nameService = dns.findService(DNS_SERVICE_FILTER);
+  const nameService = dns.findService({ type: "dns", priority: "<10" });
   const rname = dns.administratorEmail.replace(/@/, ".");
 
   const SOARecord = DNSRecord(

package/src/services/ntp.mjs

@@ -24,8 +24,6 @@ const NTPServiceTypeDefinition = {
   }
 };
 
-const NTP_SERVICE_FILTER = { type: NTPServiceTypeDefinition.name };
-
 export class NTPService extends ExtraSourceService {
   static {
     addType(this);
@@ -64,19 +62,19 @@ export class NTPService extends ExtraSourceService {
     };
 
     const lines = [
-      ...serviceEndpoints(
-        this,
-        {
-          ...NTP_SERVICE_FILTER,
-          priority: ">=10"
+      ...serviceEndpoints(this, {
+        services: {
+          type: "ntp",
+          priority: ">=20"
         },
-        e => e.family === "IPv4" && e.networkInterface.kind !== "loopback"
-      ).map(
-        endpoint =>
+        endpoints: e =>
+          e.family === "IPv4" && e.networkInterface.kind !== "loopback",
+
+        select: endpoint =>
           `${endpoint.service.isPool ? "pool" : "server"} ${
             endpoint.address
           } iburst`
-      ),
+      }),
       `mailonchange ${this.administratorEmail} 0.5`,
       "local stratum 10",
       "leapsectz right/UTC",

package/src/services/systemd-resolved.mjs

@@ -1,5 +1,8 @@
-import { ExtraSourceService, ServiceTypeDefinition } from "pmcf";
-import { serviceAddresses } from "../service.mjs";
+import {
+  ExtraSourceService,
+  ServiceTypeDefinition,
+  serviceEndpoints
+} from "pmcf";
 import { addType } from "../types.mjs";
 
 const SystemdResolvedServiceTypeDefinition = {
@@ -34,19 +37,22 @@ export class SystemdResolvedService extends ExtraSourceService {
   }
 
   systemdConfig(name) {
+    const options = priority => {
+      return {
+        services: { type: "dns", priority },
+        endpoints: e => e.networkInterface.kind !== "loopback",
+        select: endpoint => endpoint.address,
+        join: " "
+      };
+    };
+
     return {
       name: `etc/systemd/resolved.conf.d/${name}.conf`,
       content: [
         "Resolve",
         {
-          DNS: serviceAddresses(this, {
-            type: "dns",
-            priority: "<10"
-          }).join(" "),
-          FallbackDNS: serviceAddresses(this, {
-            type: "dns",
-            priority: ">=10"
-          }).join(" "),
+          DNS: serviceEndpoints(this, options("<10")),
+          FallbackDNS: serviceEndpoints(this, options(">=20")),
           Domains: [...this.localDomains].join(" "),
           DNSSEC: "no",
           MulticastDNS: this.network.multicastDNS ? "yes" : "no",

package/src/services/systemd-timesyncd.mjs

@@ -1,5 +1,8 @@
-import { ExtraSourceService, ServiceTypeDefinition } from "pmcf";
-import { serviceAddresses } from "../service.mjs";
+import {
+  ExtraSourceService,
+  ServiceTypeDefinition,
+  serviceEndpoints
+} from "pmcf";
 import { addType } from "../types.mjs";
 
 const SystemdTimesyncdServiceTypeDefinition = {
@@ -39,15 +42,16 @@ export class SystemdTimesyncdService extends ExtraSourceService {
       content: [
         "Time",
         {
-          NTP: serviceAddresses(
-            this,
-            {
+          NTP: serviceEndpoints(this, {
+            services: {
               type: "ntp",
-              priority: "<20"
+              priority: "<10"
             },
-            "domainName",
-            () => true
-          ).join(" ")
+            endpoints: endpoint =>
+              endpoint.networkInterface.kind !== "loopback",
+            select: endpoint => endpoint.domainName,
+            join: " "
+          })
         }
       ]
     };

package/types/endpoint.d.mts

@@ -5,7 +5,16 @@ export class Endpoint {
     toString(): string;
     get socketAddress(): string;
     get hostName(): any;
+    get domainName(): any;
     get address(): any;
     get family(): any;
     get networkInterface(): any;
 }
+export class DomainNameEndpoint {
+    constructor(service: any, domainName: any, data: any);
+    service: any;
+    domainName: any;
+    get networkInterface(): {};
+    get address(): any;
+    toString(): string;
+}

package/types/network-interfaces/skeleton.d.mts

@@ -7,6 +7,7 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     get host(): Host;
     hosts(): Generator<any, void, any>;
     get network_interface(): this;
+    get domainName(): any;
     get domainNames(): Set<any>;
     matches(other: any): boolean;
     set network(network: any);

package/types/service.d.mts

@@ -1,5 +1,4 @@
-export function serviceAddresses(sources: any, filter: any, addressType?: string, addressFilter?: (a: any) => boolean): any[];
-export function serviceEndpoints(sources: any, filter: any, endpointFilter: any): any[];
+export function serviceEndpoints(sources: any, options?: {}): string | Set<any>;
 export namespace endpointProperties {
     export namespace port {
         let type: string;

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

@@ -257,8 +257,8 @@ export class SystemdResolvedService extends ExtraSourceService {
     systemdConfig(name: any): {
         name: string;
         content: (string | {
-            DNS: string;
-            FallbackDNS: string;
+            DNS: string | Set<any>;
+            FallbackDNS: string | Set<any>;
             Domains: string;
             DNSSEC: string;
             MulticastDNS: string;

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

@@ -257,7 +257,7 @@ export class SystemdTimesyncdService extends ExtraSourceService {
     systemdConfig(name: any): {
         name: string;
         content: (string | {
-            NTP: string;
+            NTP: string | Set<any>;
         })[];
     };
 }