pmcf 1.71.0 → 1.72.0

package/package.json

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

package/src/dns.mjs

@@ -9,7 +9,7 @@ import {
 } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
-import { sortByPriority } from "./service.mjs";
+import { serviceAddresses } from "./service.mjs";
 import { subnets } from "./subnet.mjs";
 
 const DNSServiceTypeDefinition = {
@@ -91,15 +91,6 @@ export class DNSService extends Base {
     return this.#forwardsTo;
   }
 
-  get forwardsToAdresses() {
-    return this.forwardsTo
-      .map(ft => Array.from(ft.findServices(DNS_SERVICE_FILTER)))
-      .flat()
-      .sort(sortByPriority)
-      .map(s => s.rawAddresses)
-      .flat();
-  }
-
   *findServices(filter) {
     yield* this.owner.findServices(filter);
 
@@ -113,22 +104,15 @@ export class DNSService extends Base {
   }
 
   async resolvedConfig() {
-    const dnsServices = Array.from(this.findServices(DNS_SERVICE_FILTER)).sort(
-      sortByPriority
-    );
-
-    const master = dnsServices
-      .filter(s => s.priority < 10)
-      .map(s => s.rawAddresses)
-      .flat();
-    const fallback = dnsServices
-      .filter(s => s.priority >= 10)
-      .map(s => s.rawAddresses)
-      .flat();
-
     return {
-      DNS: master.join(" "),
-      FallbackDNS: fallback.join(" "),
+      DNS: serviceAddresses(this, {
+        ...DNS_SERVICE_FILTER,
+        priority: "<10"
+      }).join(" "),
+      FallbackDNS: serviceAddresses(this, {
+        ...DNS_SERVICE_FILTER,
+        priority: ">=10"
+      }).join(" "),
       Domains: this.domains.join(" "),
       DNSSEC: "no",
       MulticastDNS: "yes",
@@ -152,7 +136,9 @@ export class DNSService extends Base {
 
     const options = [
       "forwarders {",
-      ...this.forwardsToAdresses.map(a => `  ${a};`),
+      ...serviceAddresses(this.forwardsTo, DNS_SERVICE_FILTER).map(
+        a => `  ${a};`
+      ),
       "};"
     ];
     await writeLines(join(p1, "etc/named.d/options"), `${name}.conf`, options);

package/src/service.mjs

@@ -1,5 +1,6 @@
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
+import { asArray } from "./utils.mjs";
 
 const ServiceTypes = {
   dns: { protocol: "udp", port: 53 },
@@ -166,3 +167,16 @@ export class Service extends Base {
 }
 
 export const sortByPriority = (a, b) => a.priority - b.priority;
+
+export function serviceAddresses(
+  sources,
+  filter,
+  addressType = "rawAddresses"
+) {
+  return asArray(sources)
+    .map(ft => Array.from(ft.findServices(filter)))
+    .flat()
+    .sort(sortByPriority)
+    .map(s => s[addressType])
+    .flat();
+}

package/types/dns.d.mts

@@ -83,7 +83,6 @@ export class DNSService extends Base {
     get trusted(): any[];
     set forwardsTo(value: any[]);
     get forwardsTo(): any[];
-    get forwardsToAdresses(): any[];
     get domains(): any[];
     resolvedConfig(): Promise<{
         DNS: string;

package/types/service.d.mts

@@ -1,3 +1,4 @@
+export function serviceAddresses(sources: any, filter: any, addressType?: string): any[];
 export class Service extends Base {
     static get typeDefinition(): {
         name: string;