pmcf 1.67.1 → 1.68.0

package/package.json

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

package/src/dns.mjs

@@ -9,6 +9,7 @@ import {
 } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
+import { sortByPriority } from "./service.mjs";
 
 const DNSServiceTypeDefinition = {
   name: "dns",
@@ -79,6 +80,15 @@ 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);
 
@@ -93,7 +103,7 @@ export class DNSService extends Base {
 
   async resolvedConfig() {
     const dnsServices = Array.from(this.findServices(DNS_SERVICE_FILTER)).sort(
-      (a, b) => a.priority - b.priority
+      sortByPriority
     );
 
     const master = dnsServices
@@ -129,13 +139,11 @@ export class DNSService extends Base {
       }
     };
 
-    const options = ["forwarders {"];
-    for (const s of this.forwardsTo) {
-      for (const dns of s.findServices(DNS_SERVICE_FILTER)) {
-        options.push(...(dns.rawAddresses.map(a=>`  ${a};`)));
-      }
-    }
-    options.push("};");
+    const options = [
+      "forwarders {",
+      ...this.forwardsToAdresses.map(a => `  ${a};`),
+      "};"
+    ];
     await writeLines(join(p1, "etc/named.d/options"), `${name}.conf`, options);
 
     const category = [];
@@ -157,7 +165,7 @@ export class DNSService extends Base {
       category
     );
 
-    if(options.length > 2 || category.length > 2) {
+    if (options.length > 2 || category.length > 2) {
       yield result;
     }
 
@@ -167,7 +175,7 @@ export class DNSService extends Base {
       name: `named-zones-${name}`,
       description: `zone definitions for ${this.fullName}`,
       dependencies: ["mf-named"],
-      replaces: ["mf-named-zones", `named-${name}`],
+      replaces: ["mf-named-zones"],
       access: "private"
     };
 

package/src/host.mjs

@@ -266,10 +266,54 @@ export class Host extends Base {
     if (filter) {
       for (const service of this.#services) {
         if (
-          filter.type === "*" ||
-          filter.type === service.type ||
-          filter.name === service.name
+          (filter.type === undefined || filter.type === service.type) &&
+          (filter.name === undefined || filter.name === service.name)
         ) {
+          switch (typeof filter.priority) {
+            case "number":
+              if (filter.priority !== service.priority) {
+                continue;
+              }
+              break;
+            case "string":
+              const m = filter.priority.match(/^([=><!]+)(\d+)/);
+              if (m) {
+                const priority = parseInt(m[2]);
+                switch (m[1]) {
+                  case "=":
+                    if (service.priority != priority) {
+                      continue;
+                    }
+                    break;
+                  case "!=":
+                    if (service.priority == priority) {
+                      continue;
+                    }
+                    break;
+                  case "<":
+                    if (service.priority >= priority) {
+                      continue;
+                    }
+                    break;
+                  case "<=":
+                    if (service.priority > priority) {
+                      continue;
+                    }
+                    break;
+                  case ">":
+                    if (service.priority <= priority) {
+                      continue;
+                    }
+                    break;
+                  case ">=":
+                    if (service.priority < priority) {
+                      continue;
+                    }
+                    break;
+                }
+              }
+          }
+
           yield service;
         }
       }

package/src/service.mjs

@@ -1,6 +1,9 @@
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
 
+
+export const sortByPriority = (a, b) => a.priority - b.priority;
+
 const ServiceTypes = {
   dns: { protocol: "udp", port: 53 },
   ldap: { protocol: "tcp", port: 389 },

package/types/dns.d.mts

@@ -76,6 +76,7 @@ export class DNSService extends Base {
     get soaUpdates(): number[];
     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 sortByPriority(a: any, b: any): number;
 export class Service extends Base {
     static get typeDefinition(): {
         name: string;