pmcf 2.58.0 → 2.59.1

package/README.md

@@ -20,15 +20,25 @@
 
 ### Table of Contents
 
-*   [networkAddresses](#networkaddresses)
+*   [findService](#findservice)
     *   [Parameters](#parameters)
-*   [NetworkAddress](#networkaddress)
+*   [networkAddresses](#networkaddresses)
     *   [Parameters](#parameters-1)
+*   [NetworkAddress](#networkaddress)
+    *   [Parameters](#parameters-2)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [serviceEndpoints](#serviceendpoints)
-    *   [Parameters](#parameters-2)
+    *   [Parameters](#parameters-3)
+
+## findService
+
+### Parameters
+
+*   `filter` **any** 
+
+Returns **any** service with the highest priority
 
 ## networkAddresses
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.58.0",
+  "version": "2.59.1",
   "publishConfig": {
     "access": "public"
   },
@@ -45,7 +45,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "ip-utilties": "^1.3.3",
+    "ip-utilties": "^1.4.1",
     "npm-pkgbuild": "^18.2.8",
     "pacc": "^3.4.3",
     "pkg-dir": "^8.0.0"

package/src/base.mjs

@@ -373,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;
       }
     }

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

@@ -333,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;
 
 /**
  *
@@ -351,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/kea.mjs

@@ -3,7 +3,7 @@ import { FileContentProvider } from "npm-pkgbuild";
 import { reverseArpa } from "ip-utilties";
 import {
   Service,
-  sortInverseByPriority,
+  sortAscendingByPriority,
   ServiceTypeDefinition,
   Endpoint,
   UnixEndpoint,
@@ -165,7 +165,7 @@ export class KeaService extends Service {
           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);

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";