pmcf 1.102.0 → 1.102.1

package/package.json

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

package/src/service.mjs

@@ -1,6 +1,6 @@
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
-import { asArray } from "./utils.mjs";
+import { asArray,isLocalhost } from "./utils.mjs";
 import { networkAddressProperties } from "./network-support.mjs";
 import {
   DNSRecord,
@@ -277,12 +277,13 @@ export const sortByPriority = (a, b) => a.priority - b.priority;
 export function serviceAddresses(
   sources,
   filter,
-  addressType = "rawAddresses"
+  addressType = "rawAddresses",
+  addressFilter = a=>!isLocalhost(a)
 ) {
   return asArray(sources)
     .map(ft => Array.from(ft.findServices(filter)))
     .flat()
     .sort(sortByPriority)
     .map(s => s[addressType])
-    .flat();
+    .flat().filter(addressFilter);
 }

package/src/services/dns.mjs

@@ -5,8 +5,7 @@ import {
   writeLines,
   isIPv6Address,
   normalizeIPAddress,
-  isLinkLocal,
-  isLocalhost
+  isLinkLocal
 } from "../utils.mjs";
 import { DNSRecord, dnsFullName } from "../dns-utils.mjs";
 import { addType } from "../types.mjs";
@@ -158,7 +157,7 @@ export class DNSService extends Service {
         DNS: serviceAddresses(this, {
           ...DNS_SERVICE_FILTER,
           priority: "<10"
-        }).filter(a=>!isLocalhost(a)).join(" "),
+        }).join(" "),
         FallbackDNS: serviceAddresses(this, {
           ...DNS_SERVICE_FILTER,
           priority: ">=10"

package/src/services/ntp.mjs

@@ -62,7 +62,8 @@ export class NTPService extends Service {
             ...NTP_SERVICE_FILTER,
             priority: "<20"
           },
-          "domainName"
+          "domainName",
+          ()=>true
         ).join(" ")
       }
     ];

package/types/service.d.mts

@@ -1,4 +1,4 @@
-export function serviceAddresses(sources: any, filter: any, addressType?: string): any[];
+export function serviceAddresses(sources: any, filter: any, addressType?: string, addressFilter?: (a: any) => boolean): any[];
 export namespace ServiceTypeDefinition {
     export let name: string;
     export let owners: string[];