pmcf 2.57.0 → 2.59.0

package/bin/pmcf-package

@@ -33,6 +33,7 @@ const publishingDetails = createPublishingDetails(
 for (const object of root.find(args)) {
   const stagingDir = join(options.output, object.fullName);
 
+  //console.log(`packages for ${object.fullName}`);
   for await (const { sources, outputs, properties } of object.preparePackages(
     stagingDir
   )) {

package/package.json

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

package/src/base.mjs

@@ -111,11 +111,10 @@ export class Base {
               if (Array.isArray(current)) {
                 current.push(value);
               } else {
-                if(current instanceof Set) {
+                if (current instanceof Set) {
                   // TODO
                   this[property.name] = value;
-                }
-                else if (current instanceof Map) {
+                } else if (current instanceof Map) {
                   // TODO
                   this[property.name] = value;
                 } else {
@@ -374,10 +373,15 @@ export class Base {
     return this.findService({ type: "smtp" });
   }
 
+  /**
+   * 
+   * @param {any} filter 
+   * @returns service with the highest priority
+   */
   findService(filter) {
     let best;
     for (const service of this.findServices(filter)) {
-      if (!best || service.priority < best.priority) {
+      if (!best || service.priority > best.priority) {
         best = service;
       }
     }
@@ -427,16 +431,7 @@ export class Base {
     return new Set(allOutputs.filter(o => this.packaging.has(o.name)));
   }
 
-  async *preparePackages(stagingDir) {
-    yield {
-      sources: [],
-      outputs: this.outputs,
-      properties: {
-        description: `${this.typeName} definitions for ${this.fullName}`,
-        access: "private"
-      }
-    };
-  }
+  async *preparePackages(stagingDir) {}
 
   get tags() {
     return this._tags;

package/src/cluster.mjs

@@ -118,7 +118,7 @@ export class Cluster extends Host {
         cfg.push("  }");
         cfg.push(`  virtual_router_id ${cluster.routerId}`);
         cfg.push(
-          `  priority ${host.priority - (cluster.masters.has(ni) ? 0 : 5)}`
+          `  priority ${host.priority - 100 + (cluster.masters.has(ni) ? 0 : 5)}`
         );
         cfg.push("  smtp_alert");
         cfg.push("  advert_int 5");

package/src/dns-utils.mjs

@@ -23,13 +23,17 @@ export function sortZoneRecords(a, b) {
   if (a.type === "PTR") {
     const toNum = a => {
       const s = a.split(".");
-      s.pop();s.pop();s.pop();
-      return s.reverse().reduce((a, c) => BigInt(parseInt(c,16)) + 256n * 256n * a, 0n);
+      s.pop();
+      s.pop();
+      s.pop();
+      return s
+        .reverse()
+        .reduce((a, c) => BigInt(parseInt(c, 16)) + 256n * 256n * a, 0n);
     };
     return Number(toNum(a.key) - toNum(b.key));
   }
   order = a.key.localeCompare(b.key);
-  if(order) {
+  if (order) {
     return order;
   }
 
@@ -100,3 +104,7 @@ export function dnsMergeParameters(a, b) {
     ])
   );
 }
+
+export function dnsPriority(priority) {
+  return 500 - (priority ?? 10);
+}

package/src/filter.mjs

@@ -43,10 +43,17 @@ export function* objectFilter(type, objects, filter) {
           case "number":
             return filter[key] === object[key];
           case "string":
-            const m = filter[key].match(/^([=><!]+)(\d+)/);
+            let m = filter[key].match(/^([=><!]+)(\d+)/);
             if (m) {
               return compare(m[1], key, parseInt(m[2]));
             }
+
+            m = filter[key].match(/^\[(\d+):(\d+)\]/);
+            if (m) {
+              const lower = parseInt(m[1]);
+              const upper = parseInt(m[2]);
+              return lower <= object[key] && upper >= object[key];
+            }
         }
         return false;
       };

package/src/service.mjs

@@ -6,7 +6,8 @@ import {
   DNSRecord,
   dnsFullName,
   dnsFormatParameters,
-  dnsMergeParameters
+  dnsMergeParameters,
+  dnsPriority
 } from "./dns-utils.mjs";
 
 const ServiceTypes = {
@@ -268,7 +269,7 @@ export class Service extends Base {
 
   dnsRecordsForDomainName(domainName, hasSVRRecords) {
     const records = [];
-    if (this.priority <= 1 && this.alias) {
+    if (this.priority >= 390 && this.alias) {
       records.push(DNSRecord(this.alias, "CNAME", dnsFullName(domainName)));
     }
 
@@ -283,7 +284,7 @@ export class Service extends Base {
           DNSRecord(
             dnsFullName(`_${this.type}._${ep.protocol}.${domainName}`),
             "SRV",
-            this.priority ?? 10,
+            dnsPriority(this.priority),
             this.weight,
             ep.port,
             dnsFullName(this.domainName)
@@ -311,7 +312,7 @@ export class Service extends Base {
           DNSRecord(
             dnsFullName(domainName),
             dnsRecord.type,
-            this.priority ?? 10,
+            dnsPriority(this.priority),
             ".",
             dnsFormatParameters(parameters)
           )
@@ -321,7 +322,7 @@ export class Service extends Base {
           DNSRecord(
             "@",
             dnsRecord.type,
-            this.priority ?? 10,
+            dnsPriority(this.priority),
             dnsFullName(domainName)
           )
         );
@@ -332,8 +333,8 @@ export class Service extends Base {
   }
 }
 
-export const sortByPriority = (a, b) => a.priority - b.priority;
-export const sortInverseByPriority = (a, b) => b.priority - a.priority;
+export const sortAscendingByPriority = (a, b) => a.priority - b.priority;
+export const sortDescendingByPriority = (a, b) => b.priority - a.priority;
 
 /**
  *
@@ -350,7 +351,7 @@ export function serviceEndpoints(sources, options = {}) {
   const all = asArray(sources)
     .map(ft => Array.from(ft.findServices(options.services)))
     .flat()
-    .sort(sortByPriority)
+    .sort(sortDescendingByPriority)
     .map(service => service.endpoints(options.endpoints))
     .flat();
 

package/src/services/bind.mjs

@@ -236,7 +236,7 @@ export class BindService extends ExtraSourceService {
     };
 
     const forwarders = serviceEndpoints(this.source, {
-      services: { type: "dns", priority: ">=20" },
+      services: { type: "dns", priority: ">=300" },
       select: e => e.address,
       limit: 5
     });
@@ -535,7 +535,7 @@ export class BindService extends ExtraSourceService {
   }
 
   get defaultRecords() {
-    const nameService = this.findService({ type: "dns", priority: "<10" });
+    const nameService = this.findService({ type: "dns", priority: ">=300" });
 
     const SOARecord = DNSRecord(
       "@",

package/src/services/chrony.mjs

@@ -58,7 +58,7 @@ export class ChronyService extends ExtraSourceService {
       ...serviceEndpoints(this, {
         services: {
           type: "ntp",
-          priority: "<10"
+          priority: ">=200"
         },
         endpoints: e =>
           e.service.host !== host &&

package/src/services/kea.mjs

@@ -3,7 +3,7 @@ import { FileContentProvider } from "npm-pkgbuild";
 import { reverseArpa } from "ip-utilties";
 import {
   Service,
-  sortInverseByPriority,
+  sortAscendingByPriority,
   ServiceTypeDefinition,
   Endpoint,
   UnixEndpoint,
@@ -142,7 +142,7 @@ export class KeaService extends Service {
     const dnsServerEndpoints = serviceEndpoints(network, {
       services: {
         type: "dns",
-        priority: "<10"
+        priority: ">=300"
       },
       endpoints: endpoint => endpoint.networkInterface.kind !== "loopback"
     });
@@ -162,10 +162,10 @@ export class KeaService extends Service {
     const peers = async family =>
       (
         await Array.fromAsync(
-          network.findServices({ type: "dhcp", priority: "<20" })
+          network.findServices({ type: "dhcp", priority: ">=200" })
         )
       )
-        .sort(sortInverseByPriority)
+        .sort(sortAscendingByPriority)
         .map((dhcp, i) => {
           const ctrlAgentEndpoint = dhcp.endpoint(
             e =>

package/src/services/systemd-resolved.mjs

@@ -37,24 +37,24 @@ export class SystemdResolvedService extends ExtraSourceService {
   }
 
   systemdConfig(name) {
-    const options = priority => {
+    const options = (priority, limit) => {
       return {
         services: { type: "dns", priority },
         endpoints: e => e.networkInterface.kind !== "loopback",
         select: endpoint => endpoint.address,
         join: " ",
-        limit: 5
+        limit
       };
     };
 
     return {
-      serviceName: "systemd-resolved",  
+      serviceName: "systemd-resolved",
       configFileName: `etc/systemd/resolved.conf.d/${name}.conf`,
       content: [
         "Resolve",
         {
-          DNS: serviceEndpoints(this, options("<10")),
-          FallbackDNS: serviceEndpoints(this, options(">=20")),
+          DNS: serviceEndpoints(this, options(">=300", 2)),
+          FallbackDNS: serviceEndpoints(this, options("[100:199]", 4)),
           Domains: [...this.localDomains].join(" "),
           DNSSEC: "no",
           MulticastDNS: this.network.multicastDNS ? "yes" : "no",

package/src/services/systemd-timesyncd.mjs

@@ -46,11 +46,12 @@ export class SystemdTimesyncdService extends ExtraSourceService {
           NTP: serviceEndpoints(this, {
             services: {
               type: "ntp",
-              priority: "<10"
+              priority: "[200:399]"
             },
             endpoints: endpoint =>
               endpoint.networkInterface.kind !== "loopback",
             select: endpoint => endpoint.domainName,
+            limit: 2,
             join: " "
           })
         }

package/types/base.d.mts

@@ -85,6 +85,11 @@ export class Base {
     get priority(): any;
     _priority: any;
     get smtp(): any;
+    /**
+     *
+     * @param {any} filter
+     * @returns service with the highest priority
+     */
     findService(filter: any): any;
     findServices(filter: any): Generator<any, void, any>;
     set directory(directory: any);
@@ -94,14 +99,7 @@ export class Base {
     get packaging(): Set<any>;
     get derivedPackaging(): any;
     get outputs(): Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
-    preparePackages(stagingDir: any): AsyncGenerator<{
-        sources: any[];
-        outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
-        properties: {
-            description: string;
-            access: string;
-        };
-    }, void, unknown>;
+    preparePackages(stagingDir: any): AsyncGenerator<never, void, unknown>;
     set tags(value: Set<any>);
     get tags(): Set<any>;
     get isTemplate(): boolean;

package/types/dns-utils.d.mts

@@ -11,3 +11,4 @@ export function dnsFormatParameters(parameters: any): string;
 export function dnsMergeParameters(a: any, b: any): {
     [k: string]: Set<any>;
 };
+export function dnsPriority(priority: any): number;

package/types/service.d.mts

@@ -339,7 +339,7 @@ export class Service extends Base {
         toString: (maxKeyLength?: number, ttl?: string) => string;
     }[];
 }
-export function sortByPriority(a: any, b: any): number;
-export function sortInverseByPriority(a: any, b: any): number;
+export function sortAscendingByPriority(a: any, b: any): number;
+export function sortDescendingByPriority(a: any, b: any): number;
 import { Base } from "pmcf";
 import { Host } from "pmcf";