pmcf 1.101.2 → 1.102.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.101.2",
+  "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

@@ -301,7 +301,7 @@ async function generateZoneDefs(dns, location, packageData) {
     };
     configs.push(config);
 
-    const locationRecord = DNSRecord("location", "TXT", dns.location.name);
+    const locationRecord = DNSRecord("location", "TXT", locationName);
 
     const zone = {
       id: domain,

package/src/services/ntp.mjs

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

package/src/utils.mjs

@@ -94,6 +94,11 @@ export function isLinkLocal(address) {
   return address.startsWith("fe80");
 }
 
+export function isLocalhost(address) {
+  const eaddr = encodeIP(address);
+  return eaddr === IPV4_LOCALHOST || eaddr === IPV6_LOCALHOST;
+}
+
 export function normalizeIPAddress(address) {
   address = address.replace(/\/\d+$/, "");
   if (isIPv4Address(address)) {

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[];

package/types/utils.d.mts

@@ -9,6 +9,7 @@ export function isIPv4Address(address: any): boolean;
 export function generateEU64(mac: any): void;
 export function isIPv6Address(address: any): boolean;
 export function isLinkLocal(address: any): any;
+export function isLocalhost(address: any): boolean;
 export function normalizeIPAddress(address: any): any;
 export function _encode(definition: any, address: any): bigint;
 export function decodeIPv6(address: any, length: any): string;